From: tsteven4 <tsteven4@gmail.com>
Date: Fri, 18 Sep 2015 05:32:18 +0000 (-0600)
Subject: switch travis to containers and
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~10^2~16^2^2^2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=11bfc22a860dd99e9b404161ac66ca2282bc5af4;p=gpsbabel.git

switch travis to containers and
restore travis usage of build_and_test.
---

diff --git a/.travis.yml b/.travis.yml
index 050b03bd4..8c5f68fbd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,15 @@
+sudo: false
 language: cpp
 compiler:
   - gcc
   - clang
-before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -y valgrind expat
+addons:
+  apt:
+    packages:
+    - expat
+    - fop
+    - valgrind
+    - xsltproc
 script:
- - cd gpsbabel ; ./configure && make -j3 all && bash ./testo  && bash ./vtesto
-# TODO: build doc, GUI, mac
+ - ./build_and_test
+# TODO: build mac